xfont.c (xfont_open): Fix setting of font->average_width from :avgwidth property...

diff --git a/src/ChangeLog b/src/ChangeLog
index 435c09f0ff81ac9724c6ec9229658c54e08ba534..55636cc9f40913b5126b1dd874a301c7d596a140 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-29  Kenichi Handa  <handa@m17n.org>
+
+       * xfont.c (xfont_open): Fix setting of font->average_width from
+       :avgwidth property (Bug#7123).
+
 2010-09-26  Jan Djärv  <jan.h.d@swipnet.se>
 
        * xgselect.c (xg_select): Clear file descriptors not set from

diff --git a/src/xfont.c b/src/xfont.c
index d8fe40eaa93996715460cfdfa8409fa910066f4d..a676cd29c8268351b4e733ff417b7e27cab07b09 100644 (file)
--- a/src/xfont.c
+++ b/src/xfont.c
@@ -861,7 +861,7 @@ xfont_open (f, entity, pixel_size)
 
       val = Ffont_get (font_object, QCavgwidth);
       if (INTEGERP (val))
-       font->average_width = XINT (val);
+       font->average_width = XINT (val) / 10;
       if (font->average_width < 0)
        font->average_width = - font->average_width;
       if (font->average_width == 0